projects / gtk4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8727c8f)
Adwaita: Update range styling
authorMatthias Clasen <mclasen@redhat.com>
Wed, 4 Nov 2015 04:12:54 +0000 (23:12 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 4 Nov 2015 04:17:09 +0000 (23:17 -0500)
Adapt to the changes in the previous commit.

gtk/theme/Adwaita/_common.scss patch | blob | history
gtk/theme/Adwaita/gtk-contained-dark.css patch | blob | history
gtk/theme/Adwaita/gtk-contained.css patch | blob | history

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 60ae1f82bd7d18dbd8caec7f3a30ae52d4b7003a..d7f035123b9f4cecc21079ee9bdcdabe0d8574db 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1804,6 +1804,7 @@ notebook {
  * Scrollbars *
  **************/
 
+scrollbar,
 .scrollbar {
   -GtkRange-slider-width: 13;
   -GtkRange-trough-border: 0;
@@ -1825,28 +1826,25 @@ notebook {
   &.overlay-indicator {
     &:not(.dragging):not(.hovering) { // Overlay scrolling indicator
       opacity: 0.4;
+      border-style: none;
+      background-color: transparent;
 
       -GtkRange-slider-width: 5px;
 
-      .slider {
+      slider {
         margin: 0;
         background-color: $fg_color;
         border: 1px solid if($variant==light, white, black);
         background-clip: padding-box;
       }
 
-      .trough {
-        border-style: none;
-        background-color: transparent;
-      }
-
       // w/o the following margin tweaks the slider shrinks when hovering/dragging
-      &.vertical .slider {
+      &.vertical slider {
         margin-top: $_slider_margin - 1px;
         margin-bottom: $_slider_margin - 1px;
       }
 
-      &.horizontal .slider {
+      &.horizontal slider {
         margin-left: $_slider_margin - 1px;
         margin-right: $_slider_margin - 1px;
       }
@@ -1858,18 +1856,16 @@ notebook {
   }
 
   // trough coloring
-  .trough {
-    background-color: $scrollbar_bg_color;
-    border: 1px none $borders_color;
+  background-color: $scrollbar_bg_color;
+  border: 1px none $borders_color;
 
-    &:backdrop {
-      background-color: $backdrop_scrollbar_bg_color;
-      border-color: $backdrop_borders_color;
-    }
+  &:backdrop {
+    background-color: $backdrop_scrollbar_bg_color;
+    border-color: $backdrop_borders_color;
   }
 
   // slider coloring
-  .slider {
+  slider {
     background-color: mix($fg_color, $bg_color, 60%);
 
     &:hover { background-color: mix($fg_color, $bg_color, 80%); }
@@ -1885,16 +1881,18 @@ notebook {
 
 
   // sizing
-  .slider {
+  slider {
     border-radius: 100px;
     margin: $_slider_margin;
   }
 
-  &.fine-tune .slider { margin: $_slider_fine_tune_margin; }
+  &.fine-tune slider { margin: $_slider_fine_tune_margin; }
 
   &.vertical {
 
-    .slider {
+    border-left-style: solid;
+
+    slider {
       margin-left: 1px + $_slider_margin;
 
       &:dir(rtl) {
@@ -1903,7 +1901,7 @@ notebook {
       }
     }
 
-    &.fine-tune .slider {
+    &.fine-tune slider {
       margin-left: 1px + $_slider_fine_tune_margin;
 
       &:dir(rtl) {
@@ -1912,23 +1910,19 @@ notebook {
       }
     }
 
-    .trough {
-      border-left-style: solid;
-
-      &:dir(rtl) {
-        border-left-style: none;
-        border-right-style: solid;
-      }
+    &:dir(rtl) {
+      border-left-style: none;
+      border-right-style: solid;
     }
   }
 
   &.horizontal {
 
-    .slider { margin-top: 1px + $_slider_margin; }
+    slider { margin-top: 1px + $_slider_margin; }
 
-    &.fine-tune .slider { margin-top: 1px + $_slider_fine_tune_margin; }
+    &.fine-tune slider { margin-top: 1px + $_slider_fine_tune_margin; }
 
-    .trough { border-top-style: solid; }
+    border-top-style: solid;
   }
 }
 
@@ -2157,6 +2151,7 @@ checkbutton.text-button, radiobutton.text-button {
 /************
  * GtkScale *
  ************/
+scale,
 .scale,
 .scale.scale-has-marks-above.scale-has-marks-below,
 .scale.vertical.scale-has-marks-above.scale-has-marks-below {
@@ -2170,13 +2165,11 @@ checkbutton.text-button, radiobutton.text-button {
   &.fine-tune {
     outline-offset: -7px;
     outline-radius: 6px;
-    &.trough {
-      margin: 8px;
-      border-radius: 4px;
-    }
+    margin: 8px;
+    border-radius: 4px;
   }
 
-  &.slider {
+  & slider {
     //FIXME: better gradient on the slider and hover state
     @include button(normal);
     border: 1px solid;
@@ -2225,74 +2218,70 @@ checkbutton.text-button, radiobutton.text-button {
       &:backdrop { @include button(osd-backdrop); }
     }
   }
-  &.trough {
-    margin: 10px;
-    border: 1px solid $borders_color;
-    border-radius: 3px;
-    background-color: mix($bg_color, $borders_color, 60%);
-    box-shadow: inset 1px 1px transparentize(black, 0.9),
+  margin: 10px;
+  border: 1px solid $borders_color;
+  border-radius: 3px;
+  background-color: mix($bg_color, $borders_color, 60%);
+  box-shadow: inset 1px 1px transparentize(black, 0.9),
                 _widget_edge();
-    &.highlight {
-      @include progressbar_fill;
-      border-color: $selected_borders_color;
-      box-shadow: _widget_edge();
-      &.vertical { @include progressbar_fill(vertical); }
-      &:backdrop {
-         border-color: if($variant=='light', $selected_bg_color,
-                                             $selected_borders_color);
-         background-color: $selected_bg_color;
-         box-shadow: none;
-      }
+  &.highlight {
+    @include progressbar_fill;
+    border-color: $selected_borders_color;
+    box-shadow: _widget_edge();
+    &.vertical { @include progressbar_fill(vertical); }
+    &:backdrop {
+       border-color: if($variant=='light', $selected_bg_color,
+                                           $selected_borders_color);
+       background-color: $selected_bg_color;
+       box-shadow: none;
     }
-    &:insensitive, &.vertical:insensitive {
-      border-color: $insensitive_borders_color;
+  }
+  &:insensitive, &.vertical:insensitive {
+    border-color: $insensitive_borders_color;
+    background-image: none;
+    background-color: $insensitive_bg_color;
+    box-shadow: _widget_edge();
+  }
+  &:backdrop {
+    border-color: $backdrop_borders_color;
+    background-color: mix($backdrop_bg_color, $borders_color, 50%);
+    box-shadow: none;
+  }
+  &:backdrop:insensitive, .highlight:backdrop:insensitive {
+    border-color: $backdrop_borders_color;
+    background-color: $insensitive_bg_color;
+  }
+
+  //OSD troughs
+  .osd & {
+    border-color: $osd_borders_color;
+    box-shadow: none;
+    margin: 9px;
+    &.fine-tune { margin: 7px; }
+    background-color: transparentize($osd_borders_color, 0.2);
+    outline-color: transparentize($osd_fg_color, 0.8);
+    outline-offset: -8px;
+    &.highlight {
       background-image: none;
-      background-color: $insensitive_bg_color;
-      box-shadow: _widget_edge();
-    }
-    &:backdrop {
-      border-color: $backdrop_borders_color;
-      background-color: mix($backdrop_bg_color, $borders_color, 50%);
-      box-shadow: none;
+      background-color: $selected_bg_color;
     }
-    &:backdrop:insensitive, .highlight:backdrop:insensitive {
-      border-color: $backdrop_borders_color;
-      background-color: $insensitive_bg_color;
+    &:insensitive, &:backdrop:insensitive {
+      border-color: transparent;
+      background-color: transparent;
     }
-
-    //OSD troughs
-    .osd & {
+    &:backdrop {
       border-color: $osd_borders_color;
-      box-shadow: none;
-      margin: 9px;
-      &.fine-tune { margin: 7px; }
-      background-color: transparentize($osd_borders_color, 0.2);
-      outline-color: transparentize($osd_fg_color, 0.8);
-      outline-offset: -8px;
-      &.highlight {
-        background-image: none;
-        background-color: $selected_bg_color;
-      }
-      &:insensitive, &:backdrop:insensitive {
-        border-color: transparent;
-        background-color: transparent;
-      }
-      &:backdrop {
-        border-color: $osd_borders_color;
-        background-image: none;
-      }
+      background-image: none;
     }
   }
   // scales on selected list rows
   .list-row:selected & {
     border-color: $selected_borders_color;
-    &.trough {
-      box-shadow: inset 1px 1px transparentize(black, 0.9);
-      &:backdrop { box-shadow: none; }
-      &.highlight:backdrop { border-color: $selected_borders_color; }
-    }
+    box-shadow: inset 1px 1px transparentize(black, 0.9);
+    &:backdrop { box-shadow: none; }
+    &.highlight:backdrop { border-color: $selected_borders_color; }
     &:insensitive,
-    &.trough.highlight:insensitive {
+    &.highlight:insensitive {
       border-color: $selected_bg_color;
       box-shadow: none;
       background-color: mix($selected_fg_color, $selected_bg_color, 50%);
@@ -2306,7 +2295,7 @@ checkbutton.text-button, radiobutton.text-button {
                 ('.vertical', 'vert') {
   @each $w,$we in  ('scale-has-marks-below','scale_marks_below'),
                    ('scale-has-marks-above','scale_marks_above') {
-    .scale#{$d}.#{$w} {
+    scale#{$d}.#{$w} {
       -GtkScale-slider-length: 20;
       -GtkRange-slider-width: 24;
       -GtkRange-trough-border: 2;
@@ -2321,7 +2310,7 @@ checkbutton.text-button, radiobutton.text-button {
                       (':insensitive','-insensitive'),
                       (':backdrop','-backdrop'),
                       (':backdrop:insensitive','-backdrop-insensitive') {
-        &.slider#{$s} {
+        & slider#{$s} {
           $_url: 'assets/slider-#{$dn}-#{$w}#{$as}#{$asset_suffix}';
           border-style: none;
           border-radius: 0;
@@ -2338,20 +2327,20 @@ checkbutton.text-button, radiobutton.text-button {
 }
 
 %scale_marks_above_horz {
-  .trough { margin: 14px 10px 10px; }
-  &.fine-tune .trough { margin: 12px 8px 8px; }
+  margin: 14px 10px 10px;
+  &.fine-tune { margin: 12px 8px 8px; }
 }
 %scale_marks_below_horz {
- .trough { margin: 10px 10px 14px; }
-  &.fine-tune .trough { margin: 8px 8px 12px; }
+  margin: 10px 10px 14px;
+  &.fine-tune { margin: 8px 8px 12px; }
 }
 %scale_marks_above_vert {
-  .trough { margin: 10px 10px 10px 14px; }
-  &.fine-tune .trough { margin: 8px 8px 8px 12px; }
+  margin: 10px 10px 10px 14px;
+  &.fine-tune { margin: 8px 8px 8px 12px; }
 }
 %scale_marks_below_vert {
-  .trough { margin: 10px 14px 10px 10px; }
-  &.fine-tune .trough { margin: 8px 12px 8px 8px; }
+  margin: 10px 14px 10px 10px;
+  &.fine-tune { margin: 8px 12px 8px 8px; }
 }
 
 /*****************
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 5a5269ae61f815bd098aa04d48e7e3f206991252..d21d93cb59cd4095cbdc8a226c3cf0c4d606e3fa 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2350,6 +2350,7 @@ notebook {
 /**************
  * Scrollbars *
  **************/
+scrollbar,
 .scrollbar {
   -GtkRange-slider-width: 13;
   -GtkRange-trough-border: 0;
@@ -2357,72 +2358,98 @@ notebook {
   -GtkScrollbar-has-forward-stepper: false;
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
-  -GtkRange-trough-under-steppers: 1; }
-  .scrollbar button, .scrollbar headerbar button.titlebutton, headerbar .scrollbar button.titlebutton,
+  -GtkRange-trough-under-steppers: 1;
+  background-color: #282c2c;
+  border: 1px none #1c1f1f; }
+  scrollbar button, scrollbar headerbar button.titlebutton, headerbar scrollbar button.titlebutton,
+  scrollbar .titlebar button.titlebutton,
+  .titlebar scrollbar button.titlebutton,
+  .scrollbar button,
+  .scrollbar headerbar button.titlebutton,
+  headerbar .scrollbar button.titlebutton,
   .scrollbar .titlebar button.titlebutton,
   .titlebar .scrollbar button.titlebutton {
     border: none; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering),
   .scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     opacity: 0.4;
+    border-style: none;
+    background-color: transparent;
     -GtkRange-slider-width: 5px; }
-    .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+    .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
       margin: 0;
       background-color: #eeeeec;
       border: 1px solid black;
       background-clip: padding-box; }
-    .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .trough {
-      border-style: none;
-      background-color: transparent; }
-    .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical .slider {
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider,
+    .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
       margin-top: 2px;
       margin-bottom: 2px; }
-    .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal .slider {
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider,
+    .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
       margin-left: 2px;
       margin-right: 2px; }
-  .scrollbar.overlay-indicator.dragging, .scrollbar.overlay-indicator.hovering {
+  scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering,
+  .scrollbar.overlay-indicator.dragging,
+  .scrollbar.overlay-indicator.hovering {
     opacity: 0.7; }
-  .scrollbar .trough {
-    background-color: #282c2c;
-    border: 1px none #1c1f1f; }
-    .scrollbar .trough:backdrop {
-      background-color: #323737;
-      border-color: #1f2222; }
-  .scrollbar .slider {
+  scrollbar:backdrop,
+  .scrollbar:backdrop {
+    background-color: #323737;
+    border-color: #1f2222; }
+  scrollbar slider,
+  .scrollbar slider {
     background-color: #a6a8a7; }
-    .scrollbar .slider:hover {
+    scrollbar slider:hover,
+    .scrollbar slider:hover {
       background-color: #cacbc9; }
-    .scrollbar .slider:prelight:active {
+    scrollbar slider:prelight:active,
+    .scrollbar slider:prelight:active {
       background-color: #2a76c6; }
-    .scrollbar .slider:backdrop {
+    scrollbar slider:backdrop,
+    .scrollbar slider:backdrop {
       background-color: #5d6262; }
-    .scrollbar .slider:insensitive {
+    scrollbar slider:insensitive,
+    .scrollbar slider:insensitive {
       background-color: transparent; }
-  .scrollbar .slider {
+  scrollbar slider,
+  .scrollbar slider {
     border-radius: 100px;
     margin: 3px; }
-  .scrollbar.fine-tune .slider {
+  scrollbar.fine-tune slider,
+  .scrollbar.fine-tune slider {
     margin: 4px; }
-  .scrollbar.vertical .slider {
-    margin-left: 4px; }
-    .scrollbar.vertical .slider:dir(rtl) {
-      margin-left: 3px;
-      margin-right: 4px; }
-  .scrollbar.vertical.fine-tune .slider {
-    margin-left: 5px; }
-    .scrollbar.vertical.fine-tune .slider:dir(rtl) {
-      margin-left: 4px;
-      margin-right: 5px; }
-  .scrollbar.vertical .trough {
+  scrollbar.vertical,
+  .scrollbar.vertical {
     border-left-style: solid; }
-    .scrollbar.vertical .trough:dir(rtl) {
+    scrollbar.vertical slider,
+    .scrollbar.vertical slider {
+      margin-left: 4px; }
+      scrollbar.vertical slider:dir(rtl),
+      .scrollbar.vertical slider:dir(rtl) {
+        margin-left: 3px;
+        margin-right: 4px; }
+    scrollbar.vertical.fine-tune slider,
+    .scrollbar.vertical.fine-tune slider {
+      margin-left: 5px; }
+      scrollbar.vertical.fine-tune slider:dir(rtl),
+      .scrollbar.vertical.fine-tune slider:dir(rtl) {
+        margin-left: 4px;
+        margin-right: 5px; }
+    scrollbar.vertical:dir(rtl),
+    .scrollbar.vertical:dir(rtl) {
       border-left-style: none;
       border-right-style: solid; }
-  .scrollbar.horizontal .slider {
-    margin-top: 4px; }
-  .scrollbar.horizontal.fine-tune .slider {
-    margin-top: 5px; }
-  .scrollbar.horizontal .trough {
+  scrollbar.horizontal,
+  .scrollbar.horizontal {
     border-top-style: solid; }
+    scrollbar.horizontal slider,
+    .scrollbar.horizontal slider {
+      margin-top: 4px; }
+    scrollbar.horizontal.fine-tune slider,
+    .scrollbar.horizontal.fine-tune slider {
+      margin-top: 5px; }
 
 .scrollbars-junction,
 .scrollbars-junction.frame {
@@ -2909,6 +2936,7 @@ checkbutton.text-button, radiobutton.text-button {
 /************
  * GtkScale *
  ************/
+scale,
 .scale,
 .scale.scale-has-marks-above.scale-has-marks-below,
 .scale.vertical.scale-has-marks-above.scale-has-marks-below {
@@ -2916,20 +2944,24 @@ checkbutton.text-button, radiobutton.text-button {
   -GtkRange-slider-width: 20;
   -GtkRange-trough-border: 2;
   outline-offset: -9px;
-  outline-radius: 4px; }
+  outline-radius: 4px;
+  margin: 10px;
+  border: 1px solid #1c1f1f;
+  border-radius: 3px;
+  background-color: #2d3232;
+  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+  scale.fine-tune,
   .scale.fine-tune,
   .scale.scale-has-marks-above.scale-has-marks-below.fine-tune,
   .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune {
     outline-offset: -7px;
-    outline-radius: 6px; }
-    .scale.fine-tune.trough,
-    .scale.scale-has-marks-above.scale-has-marks-below.fine-tune.trough,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune.trough {
-      margin: 8px;
-      border-radius: 4px; }
-  .scale.slider,
-  .scale.scale-has-marks-above.scale-has-marks-below.slider,
-  .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider {
+    outline-radius: 6px;
+    margin: 8px;
+    border-radius: 4px; }
+  scale slider,
+  .scale slider,
+  .scale.scale-has-marks-above.scale-has-marks-below slider,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below slider {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -2941,9 +2973,10 @@ checkbutton.text-button, radiobutton.text-button {
     border-radius: 50%;
     border-color: #151717;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2b2f2f; }
-    .scale.slider:hover,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:hover,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
+    scale slider:hover,
+    .scale slider:hover,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:hover,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:hover {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: #1c1f1f;
@@ -2954,41 +2987,47 @@ checkbutton.text-button, radiobutton.text-button {
       border-color: #151717;
       border-radius: 50%;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(255, 255, 255, 0.14), inset 0 -1px #303535; }
-    .scale.slider:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:insensitive {
+    scale slider:insensitive,
+    .scale slider:insensitive,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:insensitive,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:insensitive {
       border-style: solid;
       border-radius: 50%;
       background-image: linear-gradient(to bottom, #333636);
       box-shadow: none; }
-    .scale.slider:backdrop,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
+    scale slider:backdrop,
+    .scale slider:backdrop,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:backdrop,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:backdrop {
       border-style: solid;
       border-radius: 50%;
       border-color: #181a1a;
       background-image: linear-gradient(to bottom, #393f3f);
       box-shadow: none; }
-    .scale.slider:backdrop:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
+    scale slider:backdrop:insensitive,
+    .scale slider:backdrop:insensitive,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:backdrop:insensitive,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:backdrop:insensitive {
       color: #5d6767;
       border-color: #1f2222;
       background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      .scale.slider:backdrop:insensitive > .label,
-      .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > .label,
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > .label {
+      scale slider:backdrop:insensitive > .label,
+      .scale slider:backdrop:insensitive > .label,
+      .scale.scale-has-marks-above.scale-has-marks-below slider:backdrop:insensitive > .label,
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:backdrop:insensitive > .label {
         color: inherit; }
-    .scale.slider:active,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:active,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
+    scale slider:active,
+    .scale slider:active,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:active,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:active {
       border: 1px solid #14375d; }
-    .osd .scale.slider, .osd
-    .scale.scale-has-marks-above.scale-has-marks-below.slider, .osd
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider {
+    .osd scale slider, .osd
+    .scale slider, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below slider, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -2998,9 +3037,10 @@ checkbutton.text-button, radiobutton.text-button {
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3);
       background-color: #202526; }
-      .osd .scale.slider:hover, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.slider:hover, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
+      .osd scale slider:hover, .osd
+      .scale slider:hover, .osd
+      .scale.scale-has-marks-above.scale-has-marks-below slider:hover, .osd
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -3009,9 +3049,10 @@ checkbutton.text-button, radiobutton.text-button {
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd .scale.slider:active, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.slider:active, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
+      .osd scale slider:active, .osd
+      .scale slider:active, .osd
+      .scale.scale-has-marks-above.scale-has-marks-below slider:active, .osd
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -3020,9 +3061,10 @@ checkbutton.text-button, radiobutton.text-button {
         text-shadow: none;
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd .scale.slider:backdrop, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
+      .osd scale slider:backdrop, .osd
+      .scale slider:backdrop, .osd
+      .scale.scale-has-marks-above.scale-has-marks-below slider:backdrop, .osd
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:backdrop {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -3030,120 +3072,130 @@ checkbutton.text-button, radiobutton.text-button {
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  .scale.trough,
-  .scale.scale-has-marks-above.scale-has-marks-below.trough,
-  .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
-    margin: 10px;
-    border: 1px solid #1c1f1f;
-    border-radius: 3px;
-    background-color: #2d3232;
-    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    .scale.trough.highlight,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight {
-      background-image: linear-gradient(to bottom, #215d9c 2px, #266cb5);
+  scale.highlight,
+  .scale.highlight,
+  .scale.scale-has-marks-above.scale-has-marks-below.highlight,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight {
+    background-image: linear-gradient(to bottom, #215d9c 2px, #266cb5);
+    border-color: #0f2b48;
+    box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
+    scale.highlight.vertical,
+    .scale.highlight.vertical,
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight.vertical,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight.vertical {
+      background-image: linear-gradient(to right, #215d9c 2px, #266cb5); }
+    scale.highlight:backdrop,
+    .scale.highlight:backdrop,
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight:backdrop,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:backdrop {
       border-color: #0f2b48;
-      box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
-      .scale.trough.highlight.vertical,
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight.vertical,
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight.vertical {
-        background-image: linear-gradient(to right, #215d9c 2px, #266cb5); }
-      .scale.trough.highlight:backdrop,
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop,
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
-        border-color: #0f2b48;
-        background-color: #215d9c;
-        box-shadow: none; }
-    .scale.trough:insensitive, .scale.trough.vertical:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough.vertical:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.vertical:insensitive {
-      border-color: #1c1f1f;
-      background-image: none;
-      background-color: #333636;
-      box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
-    .scale.trough:backdrop,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-      border-color: #1f2222;
-      background-color: #2b2f2f;
+      background-color: #215d9c;
       box-shadow: none; }
-    .scale.trough:backdrop:insensitive, .scale.trough .highlight:backdrop:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive {
-      border-color: #1f2222;
-      background-color: #333636; }
-    .osd .scale.trough, .osd
-    .scale.scale-has-marks-above.scale-has-marks-below.trough, .osd
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
+  scale:insensitive, scale.vertical:insensitive,
+  .scale:insensitive,
+  .scale.vertical:insensitive,
+  .scale.scale-has-marks-above.scale-has-marks-below:insensitive,
+  .scale.scale-has-marks-above.scale-has-marks-below.vertical:insensitive,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below.vertical:insensitive {
+    border-color: #1c1f1f;
+    background-image: none;
+    background-color: #333636;
+    box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
+  scale:backdrop,
+  .scale:backdrop,
+  .scale.scale-has-marks-above.scale-has-marks-below:backdrop,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop {
+    border-color: #1f2222;
+    background-color: #2b2f2f;
+    box-shadow: none; }
+  scale:backdrop:insensitive, scale .highlight:backdrop:insensitive,
+  .scale:backdrop:insensitive,
+  .scale .highlight:backdrop:insensitive,
+  .scale.scale-has-marks-above.scale-has-marks-below:backdrop:insensitive,
+  .scale.scale-has-marks-above.scale-has-marks-below .highlight:backdrop:insensitive,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop:insensitive,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below .highlight:backdrop:insensitive {
+    border-color: #1f2222;
+    background-color: #333636; }
+  .osd scale, .osd
+  .scale, .osd
+  .scale.scale-has-marks-above.scale-has-marks-below, .osd
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below {
+    border-color: rgba(0, 0, 0, 0.7);
+    box-shadow: none;
+    margin: 9px;
+    background-color: rgba(0, 0, 0, 0.5);
+    outline-color: rgba(238, 238, 236, 0.2);
+    outline-offset: -8px; }
+    .osd scale.fine-tune, .osd
+    .scale.fine-tune, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below.fine-tune, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune {
+      margin: 7px; }
+    .osd scale.highlight, .osd
+    .scale.highlight, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight {
+      background-image: none;
+      background-color: #215d9c; }
+    .osd scale:insensitive, .osd scale:backdrop:insensitive, .osd
+    .scale:insensitive, .osd
+    .scale:backdrop:insensitive, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below:backdrop:insensitive, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop:insensitive {
+      border-color: transparent;
+      background-color: transparent; }
+    .osd scale:backdrop, .osd
+    .scale:backdrop, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below:backdrop, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop {
       border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: none;
-      margin: 9px;
-      background-color: rgba(0, 0, 0, 0.5);
-      outline-color: rgba(238, 238, 236, 0.2);
-      outline-offset: -8px; }
-      .osd .scale.trough.fine-tune, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.fine-tune, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.fine-tune {
-        margin: 7px; }
-      .osd .scale.trough.highlight, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight {
-        background-image: none;
-        background-color: #215d9c; }
-      .osd .scale.trough:insensitive, .osd .scale.trough:backdrop:insensitive, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough:insensitive, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:insensitive, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive {
-        border-color: transparent;
-        background-color: transparent; }
-      .osd .scale.trough:backdrop, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: none; }
-  .list-row:selected .scale, .list-row:selected
+      background-image: none; }
+  .list-row:selected scale, .list-row:selected
+  .scale, .list-row:selected
   .scale.scale-has-marks-above.scale-has-marks-below, .list-row:selected
   .scale.vertical.scale-has-marks-above.scale-has-marks-below {
-    border-color: #0f2b48; }
-    .list-row:selected .scale.trough, .list-row:selected
-    .scale.scale-has-marks-above.scale-has-marks-below.trough, .list-row:selected
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
-      box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
-      .list-row:selected .scale.trough:backdrop, .list-row:selected
-      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .list-row:selected
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-        box-shadow: none; }
-      .list-row:selected .scale.trough.highlight:backdrop, .list-row:selected
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .list-row:selected
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
-        border-color: #0f2b48; }
-    .list-row:selected .scale:insensitive, .list-row:selected .scale.trough.highlight:insensitive, .list-row:selected
+    border-color: #0f2b48;
+    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
+    .list-row:selected scale:backdrop, .list-row:selected
+    .scale:backdrop, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below:backdrop, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop {
+      box-shadow: none; }
+    .list-row:selected scale.highlight:backdrop, .list-row:selected
+    .scale.highlight:backdrop, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight:backdrop, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:backdrop {
+      border-color: #0f2b48; }
+    .list-row:selected scale:insensitive, .list-row:selected scale.highlight:insensitive, .list-row:selected
+    .scale:insensitive, .list-row:selected
+    .scale.highlight:insensitive, .list-row:selected
     .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
-    .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight:insensitive, .list-row:selected
     .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:insensitive {
       border-color: #215d9c;
       box-shadow: none;
       background-color: #90aece;
       background-image: none; }
-      .list-row:selected .scale:insensitive:backdrop, .list-row:selected .scale.trough.highlight:insensitive:backdrop, .list-row:selected
+      .list-row:selected scale:insensitive:backdrop, .list-row:selected scale.highlight:insensitive:backdrop, .list-row:selected
+      .scale:insensitive:backdrop, .list-row:selected
+      .scale.highlight:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.highlight:insensitive:backdrop, .list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop {
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:insensitive:backdrop {
         background-color: #90aece; }
 
-.scale.scale-has-marks-below {
+scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   color: alpha(currentColor,0.5); }
-  .scale.scale-has-marks-below.slider {
+  scale.scale-has-marks-below slider {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3151,7 +3203,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:hover {
+  scale.scale-has-marks-below slider:hover {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3159,7 +3211,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:active {
+  scale.scale-has-marks-below slider:active {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3167,7 +3219,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:insensitive {
+  scale.scale-has-marks-below slider:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3175,7 +3227,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:backdrop {
+  scale.scale-has-marks-below slider:backdrop {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3183,7 +3235,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:backdrop:insensitive {
+  scale.scale-has-marks-below slider:backdrop:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3192,12 +3244,12 @@ checkbutton.text-button, radiobutton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.scale-has-marks-above {
+scale.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   color: alpha(currentColor,0.5); }
-  .scale.scale-has-marks-above.slider {
+  scale.scale-has-marks-above slider {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3205,7 +3257,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:hover {
+  scale.scale-has-marks-above slider:hover {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3213,7 +3265,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:active {
+  scale.scale-has-marks-above slider:active {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3221,7 +3273,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:insensitive {
+  scale.scale-has-marks-above slider:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3229,7 +3281,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:backdrop {
+  scale.scale-has-marks-above slider:backdrop {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3237,7 +3289,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:backdrop:insensitive {
+  scale.scale-has-marks-above slider:backdrop:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3246,12 +3298,12 @@ checkbutton.text-button, radiobutton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.vertical.scale-has-marks-below {
+scale.vertical.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   color: alpha(currentColor,0.5); }
-  .scale.vertical.scale-has-marks-below.slider {
+  scale.vertical.scale-has-marks-below slider {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3259,7 +3311,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:hover {
+  scale.vertical.scale-has-marks-below slider:hover {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3267,7 +3319,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:active {
+  scale.vertical.scale-has-marks-below slider:active {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3275,7 +3327,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:insensitive {
+  scale.vertical.scale-has-marks-below slider:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3283,7 +3335,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:backdrop {
+  scale.vertical.scale-has-marks-below slider:backdrop {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3291,7 +3343,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:backdrop:insensitive {
+  scale.vertical.scale-has-marks-below slider:backdrop:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3300,12 +3352,12 @@ checkbutton.text-button, radiobutton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.vertical.scale-has-marks-above {
+scale.vertical.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   color: alpha(currentColor,0.5); }
-  .scale.vertical.scale-has-marks-above.slider {
+  scale.vertical.scale-has-marks-above slider {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3313,7 +3365,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:hover {
+  scale.vertical.scale-has-marks-above slider:hover {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3321,7 +3373,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:active {
+  scale.vertical.scale-has-marks-above slider:active {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3329,7 +3381,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:insensitive {
+  scale.vertical.scale-has-marks-above slider:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3337,7 +3389,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:backdrop {
+  scale.vertical.scale-has-marks-above slider:backdrop {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3345,7 +3397,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:backdrop:insensitive {
+  scale.vertical.scale-has-marks-above slider:backdrop:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3354,25 +3406,25 @@ checkbutton.text-button, radiobutton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.scale-has-marks-above .trough {
+scale.scale-has-marks-above {
   margin: 14px 10px 10px; }
-.fine-tune.scale.scale-has-marks-above .trough {
-  margin: 12px 8px 8px; }
+  scale.fine-tune.scale-has-marks-above {
+    margin: 12px 8px 8px; }
 
-.scale.scale-has-marks-below .trough {
+scale.scale-has-marks-below {
   margin: 10px 10px 14px; }
-.fine-tune.scale.scale-has-marks-below .trough {
-  margin: 8px 8px 12px; }
+  scale.fine-tune.scale-has-marks-below {
+    margin: 8px 8px 12px; }
 
-.scale.vertical.scale-has-marks-above .trough {
+scale.vertical.scale-has-marks-above {
   margin: 10px 10px 10px 14px; }
-.fine-tune.scale.vertical.scale-has-marks-above .trough {
-  margin: 8px 8px 8px 12px; }
+  scale.fine-tune.vertical.scale-has-marks-above {
+    margin: 8px 8px 8px 12px; }
 
-.scale.vertical.scale-has-marks-below .trough {
+scale.vertical.scale-has-marks-below {
   margin: 10px 14px 10px 10px; }
-.fine-tune.scale.vertical.scale-has-marks-below .trough {
-  margin: 8px 12px 8px 8px; }
+  scale.fine-tune.vertical.scale-has-marks-below {
+    margin: 8px 12px 8px 8px; }
 
 /*****************
  * Progress bars *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 9e0492fdba1ece3365c0f794fc37ccf06512c75f..048b55b6adb99d677986b1dc17bf7b34726b44ad 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2356,6 +2356,7 @@ notebook {
 /**************
  * Scrollbars *
  **************/
+scrollbar,
 .scrollbar {
   -GtkRange-slider-width: 13;
   -GtkRange-trough-border: 0;
@@ -2363,72 +2364,98 @@ notebook {
   -GtkScrollbar-has-forward-stepper: false;
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
-  -GtkRange-trough-under-steppers: 1; }
-  .scrollbar button, .scrollbar headerbar button.titlebutton, headerbar .scrollbar button.titlebutton,
+  -GtkRange-trough-under-steppers: 1;
+  background-color: #dbdbdb;
+  border: 1px none #a1a1a1; }
+  scrollbar button, scrollbar headerbar button.titlebutton, headerbar scrollbar button.titlebutton,
+  scrollbar .titlebar button.titlebutton,
+  .titlebar scrollbar button.titlebutton,
+  .scrollbar button,
+  .scrollbar headerbar button.titlebutton,
+  headerbar .scrollbar button.titlebutton,
   .scrollbar .titlebar button.titlebutton,
   .titlebar .scrollbar button.titlebutton {
     border: none; }
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering),
   .scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
     opacity: 0.4;
+    border-style: none;
+    background-color: transparent;
     -GtkRange-slider-width: 5px; }
-    .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+    .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
       margin: 0;
       background-color: #2e3436;
       border: 1px solid white;
       background-clip: padding-box; }
-    .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .trough {
-      border-style: none;
-      background-color: transparent; }
-    .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical .slider {
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider,
+    .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
       margin-top: 2px;
       margin-bottom: 2px; }
-    .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal .slider {
+    scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider,
+    .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
       margin-left: 2px;
       margin-right: 2px; }
-  .scrollbar.overlay-indicator.dragging, .scrollbar.overlay-indicator.hovering {
+  scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering,
+  .scrollbar.overlay-indicator.dragging,
+  .scrollbar.overlay-indicator.hovering {
     opacity: 0.7; }
-  .scrollbar .trough {
-    background-color: #dbdbdb;
-    border: 1px none #a1a1a1; }
-    .scrollbar .trough:backdrop {
-      background-color: #e5e5e5;
-      border-color: darkgray; }
-  .scrollbar .slider {
+  scrollbar:backdrop,
+  .scrollbar:backdrop {
+    background-color: #e5e5e5;
+    border-color: darkgray; }
+  scrollbar slider,
+  .scrollbar slider {
     background-color: #7a7e7f; }
-    .scrollbar .slider:hover {
+    scrollbar slider:hover,
+    .scrollbar slider:hover {
       background-color: #54595b; }
-    .scrollbar .slider:prelight:active {
+    scrollbar slider:prelight:active,
+    .scrollbar slider:prelight:active {
       background-color: #2a76c6; }
-    .scrollbar .slider:backdrop {
+    scrollbar slider:backdrop,
+    .scrollbar slider:backdrop {
       background-color: #c7c8c9; }
-    .scrollbar .slider:insensitive {
+    scrollbar slider:insensitive,
+    .scrollbar slider:insensitive {
       background-color: transparent; }
-  .scrollbar .slider {
+  scrollbar slider,
+  .scrollbar slider {
     border-radius: 100px;
     margin: 3px; }
-  .scrollbar.fine-tune .slider {
+  scrollbar.fine-tune slider,
+  .scrollbar.fine-tune slider {
     margin: 4px; }
-  .scrollbar.vertical .slider {
-    margin-left: 4px; }
-    .scrollbar.vertical .slider:dir(rtl) {
-      margin-left: 3px;
-      margin-right: 4px; }
-  .scrollbar.vertical.fine-tune .slider {
-    margin-left: 5px; }
-    .scrollbar.vertical.fine-tune .slider:dir(rtl) {
-      margin-left: 4px;
-      margin-right: 5px; }
-  .scrollbar.vertical .trough {
+  scrollbar.vertical,
+  .scrollbar.vertical {
     border-left-style: solid; }
-    .scrollbar.vertical .trough:dir(rtl) {
+    scrollbar.vertical slider,
+    .scrollbar.vertical slider {
+      margin-left: 4px; }
+      scrollbar.vertical slider:dir(rtl),
+      .scrollbar.vertical slider:dir(rtl) {
+        margin-left: 3px;
+        margin-right: 4px; }
+    scrollbar.vertical.fine-tune slider,
+    .scrollbar.vertical.fine-tune slider {
+      margin-left: 5px; }
+      scrollbar.vertical.fine-tune slider:dir(rtl),
+      .scrollbar.vertical.fine-tune slider:dir(rtl) {
+        margin-left: 4px;
+        margin-right: 5px; }
+    scrollbar.vertical:dir(rtl),
+    .scrollbar.vertical:dir(rtl) {
       border-left-style: none;
       border-right-style: solid; }
-  .scrollbar.horizontal .slider {
-    margin-top: 4px; }
-  .scrollbar.horizontal.fine-tune .slider {
-    margin-top: 5px; }
-  .scrollbar.horizontal .trough {
+  scrollbar.horizontal,
+  .scrollbar.horizontal {
     border-top-style: solid; }
+    scrollbar.horizontal slider,
+    .scrollbar.horizontal slider {
+      margin-top: 4px; }
+    scrollbar.horizontal.fine-tune slider,
+    .scrollbar.horizontal.fine-tune slider {
+      margin-top: 5px; }
 
 .scrollbars-junction,
 .scrollbars-junction.frame {
@@ -3071,6 +3098,7 @@ checkbutton.text-button, radiobutton.text-button {
 /************
  * GtkScale *
  ************/
+scale,
 .scale,
 .scale.scale-has-marks-above.scale-has-marks-below,
 .scale.vertical.scale-has-marks-above.scale-has-marks-below {
@@ -3078,20 +3106,24 @@ checkbutton.text-button, radiobutton.text-button {
   -GtkRange-slider-width: 20;
   -GtkRange-trough-border: 2;
   outline-offset: -9px;
-  outline-radius: 4px; }
+  outline-radius: 4px;
+  margin: 10px;
+  border: 1px solid #a1a1a1;
+  border-radius: 3px;
+  background-color: #cfcfcf;
+  box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
+  scale.fine-tune,
   .scale.fine-tune,
   .scale.scale-has-marks-above.scale-has-marks-below.fine-tune,
   .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune {
     outline-offset: -7px;
-    outline-radius: 6px; }
-    .scale.fine-tune.trough,
-    .scale.scale-has-marks-above.scale-has-marks-below.fine-tune.trough,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune.trough {
-      margin: 8px;
-      border-radius: 4px; }
-  .scale.slider,
-  .scale.scale-has-marks-above.scale-has-marks-below.slider,
-  .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider {
+    outline-radius: 6px;
+    margin: 8px;
+    border-radius: 4px; }
+  scale slider,
+  .scale slider,
+  .scale.scale-has-marks-above.scale-has-marks-below slider,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below slider {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #a1a1a1;
@@ -3103,9 +3135,10 @@ checkbutton.text-button, radiobutton.text-button {
     border-radius: 50%;
     border-color: #999999;
     box-shadow: inset 0 1px white, inset 0 -2px #ededed, inset 0 -1px #c7c7c7; }
-    .scale.slider:hover,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:hover,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
+    scale slider:hover,
+    .scale slider:hover,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:hover,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:hover {
       color: #2e3436;
       outline-color: rgba(46, 52, 54, 0.3);
       border-color: #a1a1a1;
@@ -3116,41 +3149,47 @@ checkbutton.text-button, radiobutton.text-button {
       border-color: #999999;
       border-radius: 50%;
       box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #d6d6d6; }
-    .scale.slider:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:insensitive {
+    scale slider:insensitive,
+    .scale slider:insensitive,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:insensitive,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:insensitive {
       border-style: solid;
       border-radius: 50%;
       background-image: linear-gradient(to bottom, #f4f4f4);
       box-shadow: none; }
-    .scale.slider:backdrop,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
+    scale slider:backdrop,
+    .scale slider:backdrop,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:backdrop,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:backdrop {
       border-style: solid;
       border-radius: 50%;
       border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #ededed);
       box-shadow: none; }
-    .scale.slider:backdrop:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive {
+    scale slider:backdrop:insensitive,
+    .scale slider:backdrop:insensitive,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:backdrop:insensitive,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:backdrop:insensitive {
       color: #c7c7c7;
       border-color: darkgray;
       background-image: linear-gradient(to bottom, #f4f4f4);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      .scale.slider:backdrop:insensitive > .label,
-      .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > .label,
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive > .label {
+      scale slider:backdrop:insensitive > .label,
+      .scale slider:backdrop:insensitive > .label,
+      .scale.scale-has-marks-above.scale-has-marks-below slider:backdrop:insensitive > .label,
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:backdrop:insensitive > .label {
         color: inherit; }
-    .scale.slider:active,
-    .scale.scale-has-marks-above.scale-has-marks-below.slider:active,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
+    scale slider:active,
+    .scale slider:active,
+    .scale.scale-has-marks-above.scale-has-marks-below slider:active,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:active {
       border: 1px solid #153d65; }
-    .osd .scale.slider, .osd
-    .scale.scale-has-marks-above.scale-has-marks-below.slider, .osd
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider {
+    .osd scale slider, .osd
+    .scale slider, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below slider, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below slider {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -3160,9 +3199,10 @@ checkbutton.text-button, radiobutton.text-button {
       icon-shadow: 0 1px black;
       outline-color: rgba(238, 238, 236, 0.3);
       background-color: #202526; }
-      .osd .scale.slider:hover, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.slider:hover, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
+      .osd scale slider:hover, .osd
+      .scale slider:hover, .osd
+      .scale.scale-has-marks-above.scale-has-marks-below slider:hover, .osd
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
@@ -3171,9 +3211,10 @@ checkbutton.text-button, radiobutton.text-button {
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd .scale.slider:active, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.slider:active, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
+      .osd scale slider:active, .osd
+      .scale slider:active, .osd
+      .scale.scale-has-marks-above.scale-has-marks-below slider:active, .osd
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
@@ -3182,9 +3223,10 @@ checkbutton.text-button, radiobutton.text-button {
         text-shadow: none;
         icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
-      .osd .scale.slider:backdrop, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
+      .osd scale slider:backdrop, .osd
+      .scale slider:backdrop, .osd
+      .scale.scale-has-marks-above.scale-has-marks-below slider:backdrop, .osd
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below slider:backdrop {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
@@ -3192,120 +3234,130 @@ checkbutton.text-button, radiobutton.text-button {
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
-  .scale.trough,
-  .scale.scale-has-marks-above.scale-has-marks-below.trough,
-  .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
-    margin: 10px;
-    border: 1px solid #a1a1a1;
-    border-radius: 3px;
-    background-color: #cfcfcf;
-    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
-    .scale.trough.highlight,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight {
-      background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
-      border-color: #184472;
-      box-shadow: 0 1px white; }
-      .scale.trough.highlight.vertical,
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight.vertical,
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight.vertical {
-        background-image: linear-gradient(to right, #4a90d9 2px, #63a0de); }
-      .scale.trough.highlight:backdrop,
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop,
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
-        border-color: #4a90d9;
-        background-color: #4a90d9;
-        box-shadow: none; }
-    .scale.trough:insensitive, .scale.trough.vertical:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough.vertical:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.vertical:insensitive {
-      border-color: #a1a1a1;
-      background-image: none;
-      background-color: #f4f4f4;
-      box-shadow: 0 1px white; }
-    .scale.trough:backdrop,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-      border-color: darkgray;
-      background-color: #c7c7c7;
+  scale.highlight,
+  .scale.highlight,
+  .scale.scale-has-marks-above.scale-has-marks-below.highlight,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight {
+    background-image: linear-gradient(to bottom, #4a90d9 2px, #63a0de);
+    border-color: #184472;
+    box-shadow: 0 1px white; }
+    scale.highlight.vertical,
+    .scale.highlight.vertical,
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight.vertical,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight.vertical {
+      background-image: linear-gradient(to right, #4a90d9 2px, #63a0de); }
+    scale.highlight:backdrop,
+    .scale.highlight:backdrop,
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight:backdrop,
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:backdrop {
+      border-color: #4a90d9;
+      background-color: #4a90d9;
       box-shadow: none; }
-    .scale.trough:backdrop:insensitive, .scale.trough .highlight:backdrop:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
-    .scale.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive,
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive {
-      border-color: darkgray;
-      background-color: #f4f4f4; }
-    .osd .scale.trough, .osd
-    .scale.scale-has-marks-above.scale-has-marks-below.trough, .osd
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
+  scale:insensitive, scale.vertical:insensitive,
+  .scale:insensitive,
+  .scale.vertical:insensitive,
+  .scale.scale-has-marks-above.scale-has-marks-below:insensitive,
+  .scale.scale-has-marks-above.scale-has-marks-below.vertical:insensitive,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below.vertical:insensitive {
+    border-color: #a1a1a1;
+    background-image: none;
+    background-color: #f4f4f4;
+    box-shadow: 0 1px white; }
+  scale:backdrop,
+  .scale:backdrop,
+  .scale.scale-has-marks-above.scale-has-marks-below:backdrop,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop {
+    border-color: darkgray;
+    background-color: #c7c7c7;
+    box-shadow: none; }
+  scale:backdrop:insensitive, scale .highlight:backdrop:insensitive,
+  .scale:backdrop:insensitive,
+  .scale .highlight:backdrop:insensitive,
+  .scale.scale-has-marks-above.scale-has-marks-below:backdrop:insensitive,
+  .scale.scale-has-marks-above.scale-has-marks-below .highlight:backdrop:insensitive,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop:insensitive,
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below .highlight:backdrop:insensitive {
+    border-color: darkgray;
+    background-color: #f4f4f4; }
+  .osd scale, .osd
+  .scale, .osd
+  .scale.scale-has-marks-above.scale-has-marks-below, .osd
+  .scale.vertical.scale-has-marks-above.scale-has-marks-below {
+    border-color: rgba(0, 0, 0, 0.7);
+    box-shadow: none;
+    margin: 9px;
+    background-color: rgba(0, 0, 0, 0.5);
+    outline-color: rgba(238, 238, 236, 0.2);
+    outline-offset: -8px; }
+    .osd scale.fine-tune, .osd
+    .scale.fine-tune, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below.fine-tune, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune {
+      margin: 7px; }
+    .osd scale.highlight, .osd
+    .scale.highlight, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight {
+      background-image: none;
+      background-color: #4a90d9; }
+    .osd scale:insensitive, .osd scale:backdrop:insensitive, .osd
+    .scale:insensitive, .osd
+    .scale:backdrop:insensitive, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below:backdrop:insensitive, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop:insensitive {
+      border-color: transparent;
+      background-color: transparent; }
+    .osd scale:backdrop, .osd
+    .scale:backdrop, .osd
+    .scale.scale-has-marks-above.scale-has-marks-below:backdrop, .osd
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop {
       border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: none;
-      margin: 9px;
-      background-color: rgba(0, 0, 0, 0.5);
-      outline-color: rgba(238, 238, 236, 0.2);
-      outline-offset: -8px; }
-      .osd .scale.trough.fine-tune, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.fine-tune, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.fine-tune {
-        margin: 7px; }
-      .osd .scale.trough.highlight, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight {
-        background-image: none;
-        background-color: #4a90d9; }
-      .osd .scale.trough:insensitive, .osd .scale.trough:backdrop:insensitive, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough:insensitive, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:insensitive, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive {
-        border-color: transparent;
-        background-color: transparent; }
-      .osd .scale.trough:backdrop, .osd
-      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .osd
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: none; }
-  .list-row:selected .scale, .list-row:selected
+      background-image: none; }
+  .list-row:selected scale, .list-row:selected
+  .scale, .list-row:selected
   .scale.scale-has-marks-above.scale-has-marks-below, .list-row:selected
   .scale.vertical.scale-has-marks-above.scale-has-marks-below {
-    border-color: #184472; }
-    .list-row:selected .scale.trough, .list-row:selected
-    .scale.scale-has-marks-above.scale-has-marks-below.trough, .list-row:selected
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
-      box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
-      .list-row:selected .scale.trough:backdrop, .list-row:selected
-      .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .list-row:selected
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop {
-        box-shadow: none; }
-      .list-row:selected .scale.trough.highlight:backdrop, .list-row:selected
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .list-row:selected
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop {
-        border-color: #184472; }
-    .list-row:selected .scale:insensitive, .list-row:selected .scale.trough.highlight:insensitive, .list-row:selected
+    border-color: #184472;
+    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
+    .list-row:selected scale:backdrop, .list-row:selected
+    .scale:backdrop, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below:backdrop, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below:backdrop {
+      box-shadow: none; }
+    .list-row:selected scale.highlight:backdrop, .list-row:selected
+    .scale.highlight:backdrop, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight:backdrop, .list-row:selected
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:backdrop {
+      border-color: #184472; }
+    .list-row:selected scale:insensitive, .list-row:selected scale.highlight:insensitive, .list-row:selected
+    .scale:insensitive, .list-row:selected
+    .scale.highlight:insensitive, .list-row:selected
     .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
-    .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive, .list-row:selected
+    .scale.scale-has-marks-above.scale-has-marks-below.highlight:insensitive, .list-row:selected
     .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected
-    .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive {
+    .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:insensitive {
       border-color: #4a90d9;
       box-shadow: none;
       background-color: #a5c8ec;
       background-image: none; }
-      .list-row:selected .scale:insensitive:backdrop, .list-row:selected .scale.trough.highlight:insensitive:backdrop, .list-row:selected
+      .list-row:selected scale:insensitive:backdrop, .list-row:selected scale.highlight:insensitive:backdrop, .list-row:selected
+      .scale:insensitive:backdrop, .list-row:selected
+      .scale.highlight:insensitive:backdrop, .list-row:selected
       .scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
-      .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop, .list-row:selected
+      .scale.scale-has-marks-above.scale-has-marks-below.highlight:insensitive:backdrop, .list-row:selected
       .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected
-      .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop {
+      .scale.vertical.scale-has-marks-above.scale-has-marks-below.highlight:insensitive:backdrop {
         background-color: #a5c8ec; }
 
-.scale.scale-has-marks-below {
+scale.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   color: alpha(currentColor,0.5); }
-  .scale.scale-has-marks-below.slider {
+  scale.scale-has-marks-below slider {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3313,7 +3365,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:hover {
+  scale.scale-has-marks-below slider:hover {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3321,7 +3373,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:active {
+  scale.scale-has-marks-below slider:active {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3329,7 +3381,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:insensitive {
+  scale.scale-has-marks-below slider:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3337,7 +3389,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:backdrop {
+  scale.scale-has-marks-below slider:backdrop {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3345,7 +3397,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-below.slider:backdrop:insensitive {
+  scale.scale-has-marks-below slider:backdrop:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3354,12 +3406,12 @@ checkbutton.text-button, radiobutton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.scale-has-marks-above {
+scale.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   color: alpha(currentColor,0.5); }
-  .scale.scale-has-marks-above.slider {
+  scale.scale-has-marks-above slider {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3367,7 +3419,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:hover {
+  scale.scale-has-marks-above slider:hover {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3375,7 +3427,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:active {
+  scale.scale-has-marks-above slider:active {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3383,7 +3435,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:insensitive {
+  scale.scale-has-marks-above slider:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3391,7 +3443,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:backdrop {
+  scale.scale-has-marks-above slider:backdrop {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3399,7 +3451,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.scale-has-marks-above.slider:backdrop:insensitive {
+  scale.scale-has-marks-above slider:backdrop:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3408,12 +3460,12 @@ checkbutton.text-button, radiobutton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.vertical.scale-has-marks-below {
+scale.vertical.scale-has-marks-below {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   color: alpha(currentColor,0.5); }
-  .scale.vertical.scale-has-marks-below.slider {
+  scale.vertical.scale-has-marks-below slider {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3421,7 +3473,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:hover {
+  scale.vertical.scale-has-marks-below slider:hover {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3429,7 +3481,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:active {
+  scale.vertical.scale-has-marks-below slider:active {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3437,7 +3489,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:insensitive {
+  scale.vertical.scale-has-marks-below slider:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3445,7 +3497,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:backdrop {
+  scale.vertical.scale-has-marks-below slider:backdrop {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3453,7 +3505,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-below.slider:backdrop:insensitive {
+  scale.vertical.scale-has-marks-below slider:backdrop:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3462,12 +3514,12 @@ checkbutton.text-button, radiobutton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.vertical.scale-has-marks-above {
+scale.vertical.scale-has-marks-above {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
   color: alpha(currentColor,0.5); }
-  .scale.vertical.scale-has-marks-above.slider {
+  scale.vertical.scale-has-marks-above slider {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3475,7 +3527,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:hover {
+  scale.vertical.scale-has-marks-above slider:hover {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3483,7 +3535,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:active {
+  scale.vertical.scale-has-marks-above slider:active {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3491,7 +3543,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:insensitive {
+  scale.vertical.scale-has-marks-above slider:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3499,7 +3551,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:backdrop {
+  scale.vertical.scale-has-marks-above slider:backdrop {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3507,7 +3559,7 @@ checkbutton.text-button, radiobutton.text-button {
     background-repeat: no-repeat;
     background-position: center;
     box-shadow: none; }
-  .scale.vertical.scale-has-marks-above.slider:backdrop:insensitive {
+  scale.vertical.scale-has-marks-above slider:backdrop:insensitive {
     border-style: none;
     border-radius: 0;
     background-color: transparent;
@@ -3516,25 +3568,25 @@ checkbutton.text-button, radiobutton.text-button {
     background-position: center;
     box-shadow: none; }
 
-.scale.scale-has-marks-above .trough {
+scale.scale-has-marks-above {
   margin: 14px 10px 10px; }
-.fine-tune.scale.scale-has-marks-above .trough {
-  margin: 12px 8px 8px; }
+  scale.fine-tune.scale-has-marks-above {
+    margin: 12px 8px 8px; }
 
-.scale.scale-has-marks-below .trough {
+scale.scale-has-marks-below {
   margin: 10px 10px 14px; }
-.fine-tune.scale.scale-has-marks-below .trough {
-  margin: 8px 8px 12px; }
+  scale.fine-tune.scale-has-marks-below {
+    margin: 8px 8px 12px; }
 
-.scale.vertical.scale-has-marks-above .trough {
+scale.vertical.scale-has-marks-above {
   margin: 10px 10px 10px 14px; }
-.fine-tune.scale.vertical.scale-has-marks-above .trough {
-  margin: 8px 8px 8px 12px; }
+  scale.fine-tune.vertical.scale-has-marks-above {
+    margin: 8px 8px 8px 12px; }
 
-.scale.vertical.scale-has-marks-below .trough {
+scale.vertical.scale-has-marks-below {
   margin: 10px 14px 10px 10px; }
-.fine-tune.scale.vertical.scale-has-marks-below .trough {
-  margin: 8px 12px 8px 8px; }
+  scale.fine-tune.vertical.scale-has-marks-below {
+    margin: 8px 12px 8px 8px; }
 
 /*****************
  * Progress bars *
Unnamed repository; edit this file 'description' to name the repository.